since we need this for Android targeting crosswalk-5, I suggest to merge it now and @wang16 created an issue to track it.