Merge changes from topic 'java_hidl_support'
am: 6902285a44

Change-Id: Ifd0820a0caaa9d853feb8632d78132aec32b32a4