Merge "aosp_arm64_ab is vndk"
am: f38900dc92

Change-Id: I09157be57b71386912b0b96b9748932c30813acd