Merge "Fix build" into gingerbread-plus-aosp