change our custom android stuff to pull into /vigor and not /android

avoids conflict with CM's /android project

Change-Id: Ieb763b6bddacfdb18392bab6e05dfc826277b0e6
change our stuff in /android to map to /vigor; otherwise it conflicts with CM's /android

Change-Id: I8ae4adc9e72901d32efa0734df287aa68965b3d3