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

* commit 'd1dc40293d4d10631b5dc1dd5d7bd6a62b98487f':
  Backport framework changes to AppCompat

Change-Id: I7af9743a2fa04a284feeac143096b1fb6009cf46