Merge "DO NOT MERGE: android.hardware.graphics.allocator@2.0 is no longer VNDK-SP"
am: 5a05f0e3a1  -s ours

Change-Id: I27ec192afcb4e253f320b97846f0ae038200be27