Merge "Merge "Test bundle format in AppCompat" into nyc-dev am: 13fba4b13e am: 4460b4bd04" into nyc-mr1-dev-plus-aosp