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

* commit 'd78fa463efa11449f9332e0b11ea8287feb84d8e':
  Backport framework changes to AppCompat

Change-Id: I0eaa8a5515eecba883db5a974308bec7228b62d1