Merge "libbinder_ndk: remove static variant" am: 152b3e4727
am: dd8e6a0bc7

Change-Id: Idf12071902121ab04f1e326e1997b5004cc04cf1