Merge "Include the subdir Android.mks in fixed order."