Fix apk filter to take into account variant abi filters.

Change-Id: Ifdf6207ecf6548cacab126db07c6d529ef25bcd8
Fix menu.xml naming for BlankActivityWithFragment

This change fixes the blank activity with fragment template's
naming scheme for its menu.xml file by moving the menu name
declaration from globals to a parameter so that it can
dynamically update and recieve validation.

Change-Id: I837535580b8fc4297d26012a95afe7a2f49c157f
Add ability to escape resource strings without XML escapes

This is needed for a bugfix in the IDE (issue 76606)

Change-Id: If23482ce57599ea7b4b0e8a7ce50453e60814fad
Merge "Add ability to escape resource strings without XML escapes" into studio-1.0-dev
Merge "Add ability to escape resource strings without XML escapes" into studio-1.0-dev
automerge: 33d1a0c

* commit '33d1a0cab023fd004573279d1d58b091338396b7':
  Add ability to escape resource strings without XML escapes
Fixed regression where multiple uses-sdk would be present in merged file

To allow manifest merging in androidTest sources, we moved the system
property injection before the merging process rather than after. During
this property injection, some xml elements (like uses-sdk) can be created
and we did not force a re-parsing of the xml to find the new added elements.

Change-Id: Ibf1e8bafcda8f8a912a8518e02e6663dceee894a
Merge "Fix menu.xml naming for BlankActivityWithFragment" into studio-1.0-dev
Merge "Fix menu.xml naming for BlankActivityWithFragment" into studio-1.0-dev
automerge: 2718a18

* commit '2718a18582e62db803f69f1ec93a0b7bcf404b72':
  Fix menu.xml naming for BlankActivityWithFragment
Fix menu naming for Blank/Tabbed Activity

This change fixes the menu naming by moving it from a globals
declaration to a parameter so it can be verified/auto generated.

Change-Id: Ie2796024ae77643897091eadc50121ca325195b9
Merge "Fix menu naming for Blank/Tabbed Activity" into studio-1.0-dev
Merge "Fix menu naming for Blank/Tabbed Activity" into studio-1.0-dev
automerge: ba75175

* commit 'ba7517564baf97966cf4482143b3bc548e8186d7':
  Fix menu naming for Blank/Tabbed Activity
Merge "Fixed regression where multiple uses-sdk would be present in merged file" into studio-1.0-dev
Merge "Fixed regression where multiple uses-sdk would be present in merged file" into studio-1.0-dev
automerge: 2f51c57

* commit '2f51c572e9e5e321e405d5005c4fbe199b7df939':
  Fixed regression where multiple uses-sdk would be present in merged file
Disable integTest when running buildTest on Mac and Windows.

Change-Id: If5c71b36acf0d283b7b1bc006667bcef1ba18131
Merge "Fix apk filter to take into account variant abi filters." into studio-1.0-dev
Include resValues and buildConfigFields in the model.

The interface was already there on BuildType and ProductFlavor
so now we return the values instead of empty maps.

Bug: 73595

Change-Id: If9130f1f4dc58b71bacb70211ae3bf8582dcc38a
Merge "Fix apk filter to take into account variant abi filters." into studio-1.0-dev
automerge: 6aad05e

* commit '6aad05e83f69bc679285365ad97ab2c8d5ead2db':
  Fix apk filter to take into account variant abi filters.
Merge "Include resValues and buildConfigFields in the model." into studio-1.0-dev
Merge "Include resValues and buildConfigFields in the model." into studio-1.0-dev
automerge: 1447c02

* commit '1447c02ca89c08eeff2f41143531d3cd7344dae7':
  Include resValues and buildConfigFields in the model.
Add the resValue output folder to the model.

It needs to be added to the model as a generated source
folder so that it's properly flagged in the IDE.

Change-Id: I4efdd26535800631aa5781e9c1d3cb66570cffbc