Merge "Remove obsolete Android.bp file"