Merge "Allow libandroidio to be used in the art sdk"