am 5c61dfc2: am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev

* commit '5c61dfc25fed75a436dc32b0fb18854bde0c4cea':
  AAPT: Handle all old unversioned attribute usage