Merge "Fix AOSP build" into jb-mr1-dev