Previous change e254526f inadvertently removed the line to include the tests/Android.mk file. Bug: 30188076 Test: make checkbuild Change-Id: Ia0ba14a70d2232d464420265a7a5f9c4dde3661b