Merge "AML: Apply changes under frameworks/av to frameworks/base"