Merge "Backport framework changes to AppCompat" into nyc-dev
am: d1dc40293d

* commit 'd1dc40293d4d10631b5dc1dd5d7bd6a62b98487f':
  Backport framework changes to AppCompat

Change-Id: Id2b5a941f512d05ddb56f5ccd5bc3e3b35c3796d