Merge changes from topic "hidl-memory-java"
am: 887aa66d0a

Change-Id: If36ca2aad9c3e68e5a5be49e9e1566e44f40511b