Merge changes 8489,8490

* changes:
  Android specifics for 'Removes uneccessary IDL files for Geolocation permissions'.
  Removes uneccessary IDL files for Geolocation callbacks.