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

Change-Id: I43568b2f4df3f242a854634b15dedf87067ec391