Merge "Fix build." into stage-aosp-master