Merge "extractor Android.bp cleanup" am: 457c88a2bc

Change-Id: I761f574e618130252a712fc2587063a0b1c2626a