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

Change-Id: I475fdc72808a6d5767f09ac1f1796ef511696696