Merge "Make EphemeralTest test apks target API 26" into stage-aosp-master