am 653a037d: am 638ce57a: Treat LOCAL_APK_LIBRARIES like shared Java libraries.

* commit '653a037d70d770d2fc03d4f205a9c626af5f5c76':
  Treat LOCAL_APK_LIBRARIES like shared Java libraries.