Merge "Re-enable dreams: frameworks/base" into jb-mr1-dev