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

Change-Id: I3e381dd323532e4092fe836f18206e0d23a030d1