[automerger skipped] Merge "Add new file name constant for public DEX API...
[automerger skipped] Merge "Add new file name constant for public DEX API file" into pi-dev am: 68ca409c -s ours
am: 99c5e72b -s ours
Change-Id: Ia9157afd5147b9c470b5de2d36e0d1221e289389