Merge "Add a placeholder ART version number / api level for aosp/master." am: cb5c5daefc am: 6bcd17ae3b
am: a36ece5838

Change-Id: I12e99edfe1127a28307aa939053d0db2bb5c48a0