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

Change-Id: Id403462bd2044251a7e3a49326e09b47a71b8df5