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

Change-Id: I7e6d629b9ca6e87a48c332dab470771c4564985d