android: upgrade gestures and scrolling to newer code

Change-Id: I84b9f66036891f6ad384ee71d078c654511a6e38
android: upgrade layers to newer code

Change-Id: Ife0d7cfad8b416c9363321a2fd1f4e9a8a1f4325