Merge "Update build ID to AOSP"