Fix android_ prefix for upstream

Change-Id: Ie180525c5e43d0e33f10479c54c9185bc837c62d