Merge "Update media/omx/V1_0/build/Android.bp" into oc-dev