Code clean-up for android src.