Merge "Add apex_available to statsd-aidl-ndk_platform"