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

Change-Id: I60e964bc697c667c9511d88dff6c86a7ebc9efa5