Merge "Test bundle format in AppCompat" into nyc-dev
am: 13fba4b13e

* commit '13fba4b13e0c25bcb919dec79dfa83852ed44e8c':
  Test bundle format in AppCompat

Change-Id: I9ba44f56fc98201d08e63e0eda2a77d7d5101018