Merge "Add Android*.mk files to additional dependencies"