Merge "Remove useless Android.mk files." am: 75d5cf515a
am: f27cfa15d7

Change-Id: I2c554896e817483493faa5bbe54746d4f1c8b8da