Merge "Update Andriod.bp for hals."