Merge "Fix the api level annotation for AMediaCodec_getBufferFormat"