Merge changes Ide5595c6,Icf56f2a1

* changes:
  Remove unused Android.bp files
  Update comment generated by gen_blueprints.py