Merge remote-tracking branch 'weave/master' into merge

Pulling new changes from libweave into AOSP

Change-Id: I20b9773df61c40f42447f7a890bdbfcf54e5c8b2