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

Change-Id: I8d99aa0e9c58ebcbf9d6db63c15ff7b6c0b9a611