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

Change-Id: I7ec4ac17b4fead69b3ffbd754cd3ce33978c64cb