Merge "Fix the broken AAE build" into pi-dev-plus-aosp
am: a41c943b70

Change-Id: I881f48d3958a9d0c349d77d18ef5b5d55e42a547