[automerger skipped] Merge "add java_api_finder plugin to mainline module Media to generate java APIs used by Media." into qt-dev am: 01dfc109 am: d122386e
am: 1e3288d6 -s ours
am skip reason: change_id I3cdfe5e00394c6ff7b9c857f63a5e45ac79f8d24 with SHA1 66a5871d is in history

Change-Id: I5146139032995e71408f013faaa2c9e5c08aa779