Merge "Config to enable/disable AOD via overlay" into pi-dev am: b784e6f7bc
am: 89cdaab2ab

Change-Id: Iaf6cf6e0c493bb878f9219e2112dea8f90639d7c