Revert Android.bp workaround. Not needed now we have the source annotation. Bug: http://b/153760240 Test: atest UserLifecycleTests#createAndStartUser Change-Id: Id1727000284709a0a2740613ec9582b584545a2e