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

* commit '16cfb806ff2ad27fb88bf9815346d6d25ab87738':
  Backport framework changes to AppCompat

Change-Id: I3d72cf8501c42ebd8d927d437a6efe2111156288