Skip ef9f2740a7 in proposed pi-dev-plus-aosp-without-vendor merge. am: f700e7feaa
am: 15bcfcf789

Change-Id: Iec38af6624b30fcdcef4a6b3df45033eb3e15588