Merge changes Ib70e7c51,I4ccf05f3

* changes:
  transcoding: use builtin_available macro instead of __ANDROID_APEX__
  transcoding: use __ANDROID_API_FUTURE__ in __builtin_available check