Merge "android.hardware.graphics.allocator@2.0 is no longer VNDK-SP" am: 4bba172ed2
am: eec408ee59

Change-Id: Ic13025c361e7ed1550bc2f4d6d80353dad219252