Merge "libbinder_ndk: set/getExtension" am: c176c0da5f
am: 0fe4b6a451

Change-Id: If694ab2a283043b473e174dc6293b60e691928f2