Update to use STATIC_ANDROID_LIBRARIES
am: e61357b2fc

Change-Id: I300ebc90f7bf50dd6c83608d420eeb7f5b3bc5a6