Merge changes I7f413e38,I20aba7e9 into pi-dev

* changes:
  Remove FlpHardwareProvider
  Create the stubs lib for com.android.location.provider