Merge "finalize_branch_for_release: Don't build droidcore"