tree 7af27a8781bbb0054c817497a726a24fa3caff12
parent f343d111663bed8f579eee1f08b7c065da955463
author Xavier Ducrohet <xav@android.com> 1363973336 -0700
committer Xavier Ducrohet <xav@android.com> 1363973336 -0700

Update some prebuilts.

tools/base @ 2f7c8987fd248f96fdc8a2ccdad72e42d9866b68

Also include updated manifest-merger.jar since it was not
updated after 3d3d7bc8fa39679b1a64d0663530db71ae41da70

Change-Id: I0797356c081527d0b60d4560b1fc3e4a6122e4b2