Track frameworks_av back from aicp

Change-Id: Iadc1b8ace4680a94ae9abb0147a962dae90e9754