Merge commit 'eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3' into gingerbread-plus-aosp * commit 'eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3': Don't build framework tests for simulator target.
Merge commit 'eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3' into gingerbread-plus-aosp * commit 'eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3': Don't build framework tests for simulator target.