am f0042eb7: (-s ours) am 60564322: Move AOSP to another fake version number

* commit 'f0042eb787953992a6fd9e5dd440cc3bd5ec73ba':
  Move AOSP to another fake version number