Merge "Convert librilutils to Android.bp" am: 1dc06a8cfa
am: 3630e372e2

Change-Id: Icaa4f51a877af4926abf90a5179f60ac48008314