Merge changes I7459b9e9,I9bc5573e

* changes:
  frameworks base Android.mk file changes
  Deleted the media, camera, drm related files since they are relocated