Android 5.0.1, revert forks

Change-Id: I08aaab11d4a281b0dfeee637142a389586be9201