Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage" am: 60f0b06d19 am: 6ff2ad3044
am: 1c091ba045

Change-Id: I1a6d1130de87ef0a69727a7c7a7950704df47c04