Merge "Convert media effects to Android.bp" am: 3c5f389110
am: c97f122ff5

Change-Id: I794dec29b1a51b707441bd6330600de532bd7b9e