am 64dbf369: (-s ours) Fake version number for AOSP master - do not merge

* commit '64dbf369a864bb34c029366ff177a8239002a8ee':
  Fake version number for AOSP master - do not merge