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

Change-Id: I1a6504799a83d2736881b149a5181e78bc212193