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

Change-Id: I64d9787546bf34a0ee3cd65202b36c7ef018d164