Merge "aosp_arm64_ab is vndk"