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

Change-Id: Ice4c1384b236f6d1fe2756ff44fdaec4200f4218