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

* commit 'acb5a3ba578b545748b57d3ae5ae68625eeb4174':
  Backport framework changes to AppCompat

Change-Id: I162edb8ee39279ef9a378ffbc27cc7a41d2293ab