Merge "Fixes AppCompat build location" into jb-mr2-dev