Merge "Add target for android_native_app_glue" am: 52154c125b am: 306f43d581
am: 11c22b5f90

Change-Id: Ia7c12818664ebb8644b8e7515a6222919c83b0a1