Merge changes from topic 'go-away-static-hidl-java' am: f4c58cd48c am: 4e06dd1aa9 am: 92a268afa3  -s ours
am: 8ebd805421

Change-Id: I51450d809a82d009671af1ff7418681f43fc9751