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

Change-Id: I40318398eddd65bac8aa7fef297ba33dd4b0d4d9