use applicationId instead of packageName

Change-Id: I0e50008c090b22428ddfb54961c925458fff221d
(cherry picked from commit a007f4f9e1865cce09817ea8f3a8204c78d240b1)
Added ability to merge Instrumentation element from test

Instrumentation tag in a test specific AndroidManifest.xml will be merged with the
generated Instrumentation tag.

Change-Id: If69b2b26e309cfe432404c45c8f0d8a6a4d1bc63
(cherry picked from commit f6d9aadc4004ee7e73e35b6d7470e9175622f668)
Merge "use applicationId instead of packageName" into idea133-milestone
Merge "Added ability to merge Instrumentation element from test" into idea133-milestone
Update to 0.13.1

Change-Id: Ia4ea3951eb5ee7535129e821ebc31767e5e5f0b3
Merge "Update to 0.13.1" into idea133-milestone
Always copy the default config when building the variant config.

This is important so that in case of no flavors, the 2 variants have
different versions of the mergedFlavor (which is initialized with
the defaultConfig).

Otherwise, editing a mergedFlavor on a variant will actually impact
both variants.

Bug: 68528

Change-Id: I07e7bcf578a41a81d9c877b19fe482595293b960
(cherry picked from commit 75d68c764c60b6a9d21a7743268ca725b6acc258)
Merge "Always copy the default config when building the variant config." into idea133-milestone
Fix issue where there could be variants w/ no outputs.

https://code.google.com/p/android/issues/detail?id=76394

Change-Id: I088e4c0d80b1762758d4bd347e1b01e96f027549
(cherry picked from commit 8b8905af0dd479552bbf8e44ec87ad2f6134343b)
Merge "Fix issue where there could be variants w/ no outputs." into idea133-milestone
Added a simple manifest merger invocation task.

This task can be used in build.gradle to simply merge AndroidManifest
files that have no common nodes.

Change-Id: Id2cc065d57115ac5ca5796432b9f72847a818e54
(cherry picked from commit 9c04e9812c47164f2c4d705b989e25ebb7221915)
Merge "Added a simple manifest merger invocation task." into idea133-milestone